From b7207e32e413f4a0ac9ef9c502db51c509c19351 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Wed, 28 Jun 2006 20:46:01 +0100 Subject: [PATCH] Use address types in elf parser that match elf headers. Necessary if a long is a different size to addresses in elf file being parsed. From: Jimi Xenidis Signed-off-by: Keir Fraser --- tools/libxc/xc_load_elf.c | 2 +- xen/common/elf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_load_elf.c b/tools/libxc/xc_load_elf.c index 54fc9e5fc4..5e2b4de5e2 100644 --- a/tools/libxc/xc_load_elf.c +++ b/tools/libxc/xc_load_elf.c @@ -68,7 +68,7 @@ static int parseelfimage(const char *image, Elf_Ehdr *ehdr = (Elf_Ehdr *)image; Elf_Phdr *phdr; Elf_Shdr *shdr; - unsigned long kernstart = ~0UL, kernend=0UL, vaddr, virt_base, elf_pa_off; + Elf_Addr kernstart = ~0, kernend = 0, vaddr, virt_base, elf_pa_off; const char *shstrtab; char *guestinfo=NULL, *p; int h, virt_base_defined, elf_pa_off_defined; diff --git a/xen/common/elf.c b/xen/common/elf.c index b5a18f317a..2e8969d915 100644 --- a/xen/common/elf.c +++ b/xen/common/elf.c @@ -23,7 +23,7 @@ int parseelfimage(struct domain_setup_info *dsi) Elf_Ehdr *ehdr = (Elf_Ehdr *)dsi->image_addr; Elf_Phdr *phdr; Elf_Shdr *shdr; - unsigned long kernstart = ~0UL, kernend=0UL, vaddr, virt_base, elf_pa_off; + Elf_Addr kernstart = ~0, kernend = 0, vaddr, virt_base, elf_pa_off; char *shstrtab, *guestinfo=NULL, *p; char *elfbase = (char *)dsi->image_addr; int h, virt_base_defined, elf_pa_off_defined; -- 2.30.2